Merge branch 'master' into develop

This commit is contained in:
Sebastian Wehling-Benatelli 2015-08-31 13:47:22 +02:00
commit c940b092d0