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