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