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