Sync'd branch integration/inbound with upstream @ Mon Nov  3 05:22:42 PST 2014