Fixing Issue #97.
Merge branch 'refs/heads/3.3/master' into 3.3/develop
Merge branch 'refs/heads/3.3/develop' into 3.3/master