Tweaks to fix image
Merge branch 'master' into v20130604