Merge branch 'master' into text_file_preview_pr_707_with_develop
authormasensio <masensio@solidgear.es>
Mon, 7 Sep 2015 08:42:09 +0000 (10:42 +0200)
committermasensio <masensio@solidgear.es>
Mon, 7 Sep 2015 08:42:09 +0000 (10:42 +0200)

Trivial merge