Sync'd branch integration/inbound with upstream @ Wed Nov  5 02:31:42 PST 2014