Sync'd branch integration/inbound with upstream @ Tue Nov  4 12:46:35 PST 2014