Merging fix from mesa-1.6.1 to roxy

Quantum to be renamed Neutron
Merge pull request #136 from cdearborn/pull-req-release-roxy-master-4abad33f47dbdc6d22570a1cc38dd3999ac0183f

Merging in fix from mesa-1.6.1 [1/1]