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