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