Clean merge.

2014-01-23, Mark Doliner