Master

Coming in for 0.10.1 release.