No need to error here
Merge branch 'importimg-fixes' into trusty-container