Merge changes from 2012 bulletin