Upgrade 2013.07 and image bug fixes