Sync'd branch integration/inbound with upstream @ Tue Nov  4 02:17:37 PST 2014