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