Sync'd branch integration/inbound with upstream @ Wed Nov 12 14:07:03 PST 2014