Merge branch 'develop' into thumbnailOOM
authormasensio <masensio@solidgear.es>
Tue, 5 May 2015 08:31:46 +0000 (10:31 +0200)
committermasensio <masensio@solidgear.es>
Tue, 5 May 2015 08:31:46 +0000 (10:31 +0200)

Trivial merge