Merge branch 'develop' into release-1.6.2
authorjabarros <jabarros@solidgear.es>
Fri, 21 Nov 2014 09:57:38 +0000 (10:57 +0100)
committerjabarros <jabarros@solidgear.es>
Fri, 21 Nov 2014 09:57:38 +0000 (10:57 +0100)

Trivial merge