meier/master #31

Closed
meierj wants to merge 22 commits from meier/master into develop
No description provided.