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