Sync'd branch integration/inbound with upstream @ Thu Nov 13 01:15:04 PST 2014