Image choice#3

Open

vetal4444 wants to merge 11 commits intopistolero:image_choicefrom

vetal4444:image_choice

Commits on Jul 24, 2014

only check image dimensions if image fetching enabled
mwjackson
committed

Commits on Jan 3, 2015

Merge branch 'release/1.0.25' into develop
Xavier Grangier
committed

Commits on Jan 6, 2015

Merge remote-tracking branch 'origin/master' into develop
pistolero
committed

Commits on Jan 9, 2015

Merge remote-tracking branch 'source/master' into image_choice
pistolero
committed

Commits on Jan 12, 2015