Ian Whyman <ian.whyman@sabayonlinux.org>
Imported from Sunrise, closes #812
