Merge pull request #1 from oskarlin/2.0b4

2.0b4
Merge branch '2.0b4'
Merge branch 'master' into 2.0b4