fixed bug #7052
Merge branch '0.3' of https://github.com/cobaltians/cobalt into 0.3