Merge branch 'develop' into thumbnailOOM
authormasensio <masensio@solidgear.es>
Wed, 6 May 2015 11:42:43 +0000 (13:42 +0200)
committermasensio <masensio@solidgear.es>
Wed, 6 May 2015 11:42:43 +0000 (13:42 +0200)

Trivial merge