Merge branch 'master' into stable

This commit is contained in:
Dennis Schubert 2015-07-27 02:47:53 +02:00
commit 8a18f587cc

Diff content is not available