SYNR-447
Merge branch 'develop' into SYNR-447
Merge pull request #72 from brucehoff/SYNR-447

SYNR-447
fix for problem on Ubuntu SYNR-449
Merge pull request #73 from brucehoff/SYNR-447

fix for problem on Ubuntu (SYNR-449)