Sync'd branch integration/inbound with upstream @ Tue Nov 11 14:32:57 PST 2014