Prepped version for 2013.04 development