Pull some minor commits from stable

Just a minor bugfix and changing the version number.