Pre-merge with chris. Pulling now.
Pulled, to be merged with master