Commit 9a5a6f7d authored Feb 03, 2017 by Andreas Klöckner

Merge branch 'master' into 'master'

Master

See merge request !28