Hopefully fixed platform-dependent bug.
Merge remote-tracking branch 'swirldev/master'