Sync'd branch integration/inbound with upstream @ Wed Nov 12 11:09:11 PST 2014