Commit 7803b002 authored Dec 30, 2016 by Andreas Klöckner

Merge branch 'revert-type-fixing' into 'master'

Revert type fixing

See merge request !17