Merge branch 'master' into stable

This commit is contained in:
Dennis Schubert 2015-07-27 02:52:52 +02:00
commit 24f755502d

Diff content is not available