EDIT: I've just found Bug #412373, so, it actually appears both solutions have already been suggested!
PS Bug #412373 is a duplicate.
EDIT: I've just found Bug #412373, so, it actually appears both solutions have already been suggested!
PS Bug #412373 is a duplicate.