Updating to dev-master, since that's all I ever use anyway