Merge branch 'master' into console

This commit is contained in:
Joel Bodenmann 2013-12-18 15:40:10 +01:00
commit 92750f0207