Sync'd branch integration/inbound with upstream @ Tue Nov 11 16:29:58 PST 2014