Merge branch 'master' into stable

This commit is contained in:
Dennis Schubert 2016-01-26 14:36:30 +01:00
commit 629e489d1c

Diff content is not available