Sync'd branch integration/inbound with upstream @ Wed Nov 12 08:06:01 PST 2014