Fixed some tests failing in 2.0 official.
Merge branch 'issue121' into devel