Merge branch 'release-1.8'
authormasensio <masensio@solidgear.es>
Mon, 28 Sep 2015 10:33:47 +0000 (12:33 +0200)
committermasensio <masensio@solidgear.es>
Mon, 28 Sep 2015 10:33:47 +0000 (12:33 +0200)

Trivial merge