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