Merge Heather's changes from Aug 2013