Sync'd branch integration/inbound with upstream @ Mon Nov 10 18:04:55 PST 2014