Releasing 0.6.7 after merging two dev histories