Sync'd branch integration/inbound with upstream @ Tue Nov 11 19:24:53 PST 2014