Sync'd branch integration/inbound with upstream @ Mon Nov  3 13:34:46 PST 2014