Sync'd branch integration/inbound with upstream @ Wed Nov 12 10:46:04 PST 2014