Merge commit '3fbf75ab10e53' into QMts

Merging master, before master got the RDKit stuff, which we're not ready for.