Merging changes on trunk for v1.0.1 patch release
(https://projects.ecoinformatics.org/ecoinfo/versions/185) to the 1_0
branch.