test 2
Merge branch 'master' into test
Merge pull request #1 from steine/test

Merge to master, maybe.