CRA-505: Previous checkin was slightly too fast, now tested on more platforms.
Merge pull request #155 from RagnarHauge/master

CRA-505: Previous checkin was slightly too fast, now tested on more plat...