First update to 2.0
Revert "First update to 2.0"

This reverts commit 21afd633f1ffaa761372a6ba49e7c13ceb44020f.
Merge branch 'master' into UE-2.0