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