- Deleted a "." so i'll hopefully will be able to merge succesfully
- restored "." didn't help the merging problem
test
Merge remote-tracking branch 'origin/bugfixes' into rob