Merge branch 'develop' into thumbnailOOM
authormasensio <masensio@solidgear.es>
Mon, 11 May 2015 12:58:47 +0000 (14:58 +0200)
committermasensio <masensio@solidgear.es>
Mon, 11 May 2015 12:58:47 +0000 (14:58 +0200)

Trivial merge