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