Merge branch 'develop' into release-1.5.8
authorjabarros <jabarros@solidgear.es>
Tue, 8 Jul 2014 11:03:09 +0000 (13:03 +0200)
committerjabarros <jabarros@solidgear.es>
Tue, 8 Jul 2014 11:03:09 +0000 (13:03 +0200)

Trivial merge