Sync'd branch integration/inbound with upstream @ Tue Nov 11 03:32:54 PST 2014