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