Merge branch 'master' into stable

This commit is contained in:
Dennis Schubert 2015-07-27 02:42:41 +02:00
commit 216bf51315

Diff content is not available