SYNR-825
SYNR-825
SYNR-825
SYNR-825
SYNR-825
SYNR-825
SYNR-825
merged develop
backed out SYNR-814
Merge pull request #188 from brucehoff/SYNR-825

Synr 825
SYNR-814