Updating master to release 0.6.13