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