Merge branch 'release-1.7.2'
authormasensio <masensio@solidgear.es>
Mon, 6 Jul 2015 11:55:36 +0000 (13:55 +0200)
committermasensio <masensio@solidgear.es>
Mon, 6 Jul 2015 11:55:36 +0000 (13:55 +0200)

Trivial merge