Changed the version test to not use named attributes.  Added the failed
version number to the error string.
Merge branch 'timcera-master' into dev