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