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