Branch merge

[Sean Schofield]

I'm going to merge down everything from the 1.1. branch (since the
last merge) unless I hear any objections.  Nobody has done this yet
right?

sean