Merge remote-tracking branch 'origin/thumbnailOOM' into thumbnailOOM
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 12 May 2015 11:32:56 +0000 (13:32 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 12 May 2015 11:32:56 +0000 (13:32 +0200)

Trivial merge