Sync'd branch integration/inbound with upstream @ Wed Nov  5 05:06:38 PST 2014