Trello #459

Fix for unit tests getFile()
Merge remote-tracking branch 'origin/develop' into develop