merged abf2c26 from 0.9.x into master (fixes #52)