Commit 5bb73c6f748bf7945d9931268d4988dab6b3a99b

Steffen Jaeckel 2017-10-15T12:00:26

Merge branch 'fix/issues' into develop This closes #90