Syncing from Monotone at 20140221144551
Merge remote-tracking branch 'upstream/master'