Merge branch 'master' into devel
Bad test suite removed.  Closes #122

The channel definition test suite looks like it was mistakenly pasted
into another part of the file but not correctly skipped when the library
version was 1.3.
Merge branch 'issue122' into devel
Prepping 0.5.3 release.
Merge branch 'release-0.5.3'