Pre-upgrade to 13.04 commit