Merge branch 'master' into develop
authorjenkins <jenkins@160.45.63.201>
Wed, 15 Jul 2015 09:39:02 +0000 (11:39 +0200)
committerjenkins <jenkins@160.45.63.201>
Wed, 15 Jul 2015 09:39:02 +0000 (11:39 +0200)

Trivial merge