Fixing issue #250.
Merge commit 'f956595' into develop
Fixing a few broken unit tests.
Merge branch 'release/1.4.0' into develop