Sync'd branch integration/inbound with upstream @ Wed Nov  5 07:48:35 PST 2014