Merge branch 'master' into terencehill/translation_system_improvements_2
authorterencehill <piuntn@gmail.com>
Sat, 5 Sep 2015 12:10:22 +0000 (14:10 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 5 Sep 2015 12:10:22 +0000 (14:10 +0200)

Trivial merge