Sync'd branch integration/inbound with upstream @ Thu Nov 13 07:16:10 PST 2014