March 18 Merge

Merge Brian/Edmund into master - March 18, 2013