Merge branch 'master' into stable

This commit is contained in:
Dennis Schubert 2015-09-07 04:23:23 +02:00
commit 81084cde46

Diff content is not available