Pull in latest changes from jonleighton:master