1.11 beta 3
Merge pull request #3 from einhverfr/master

1.11 beta 3