Merge juberti:master to doohickey branch

Same as #3, just on the branch.
outdent 4