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