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