-
Moritz Grimm authored
The individual commits have been cherry-picked into develop. From now on, master will always reflect the released state of the code as per the Gitflow branching model. See http://nvie.com/posts/a-successful-git-branching-model/ for more information.
47fc3462