Merge branch 'master' into documentation

This commit is contained in:
Christopher Neugebauer 2016-04-25 09:51:19 +10:00
commit 05c55bd7db