Merged back 1.4 testing code
Merge branch 'master' into 1.4
Merged in test case for 1.3.20
Fixed documentation generation