Merge branch '1.x' into master

Looks like we didn't merge into master for quite a bit of time.