Roll over to dev release 0.37