Merge master back into dev after 0.6.14 release