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