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