Merging release 0.6.13 back into dev