Sync'd branch integration/inbound with upstream @ Wed Nov 12 12:40:55 PST 2014