Commit 8c4db975 authored Nov 14, 2016 by Andreas Klöckner

Merge branch 'master' into 'scalars-with-base_storgae'

# Conflicts:
#   test/test_loopy.py