Merge remote-tracking branch 'Upstream/develop' into develop

This commit is contained in:
aspangaro 2014-09-21 20:45:41 +02:00
commit 9220419409