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