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