Pull request!

Merge these commits, please.