PR: 55180 [1], 65680 [2] Submitted by: Rui Lopes <rui@ruilopes.com> [1], Roman Neuhauser <neuhauser@chello.cz> [2]