Pushed to master as commits e79fe4f675 and 93d9737d2b.