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