Sync'd branch integration/inbound with upstream @ Wed Nov 12 17:48:59 PST 2014