Merge branch 'develop' into SettingsGreyedOut
authorjabarros <jabarros@solidgear.es>
Tue, 20 Jan 2015 08:25:20 +0000 (09:25 +0100)
committerjabarros <jabarros@solidgear.es>
Tue, 20 Jan 2015 08:25:20 +0000 (09:25 +0100)

Trivial merge