Merged Aaron's branch from 6/29/2014.