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