Release 0.6.18 to Master