Merge branch 'stable'
authormasensio <masensio@solidgear.es>
Thu, 3 Dec 2015 11:50:01 +0000 (12:50 +0100)
committermasensio <masensio@solidgear.es>
Thu, 3 Dec 2015 11:50:01 +0000 (12:50 +0100)

Trivial merge