Sync'd branch integration/inbound with upstream @ Tue Nov 11 10:12:54 PST 2014