Merge branch 'stable'
authormasensio <masensio@solidgear.es>
Wed, 30 Sep 2015 08:45:20 +0000 (10:45 +0200)
committermasensio <masensio@solidgear.es>
Wed, 30 Sep 2015 08:45:20 +0000 (10:45 +0200)

Trivial merge