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