Merge "Fixes Bug lp:900910"