Sync'd branch integration/inbound with upstream @ Tue Nov 11 03:45:59 PST 2014