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