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