Fixes #1339, test commit
Merge remote branch 'origin/master'
Pushing testfile