Merge branch 'master' into terencehill/translation_system_improvements_2
authorterencehill <piuntn@gmail.com>
Tue, 1 Sep 2015 09:19:46 +0000 (11:19 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 1 Sep 2015 09:19:46 +0000 (11:19 +0200)

Trivial merge