Sync'd branch integration/inbound with upstream @ Thu Nov  6 01:28:41 PST 2014