minor fix
Merging release into master.