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