Merge remote-tracking branch 'upstream/master' into folsom-proposed