Updated to beta 5
Bug fixes
Updated to beta 6
Merge remote-tracking branch 'upstream/master'