Sync'd branch integration/inbound with upstream @ Mon Nov  3 01:31:49 PST 2014