Updated against trunk (r1145).<br><br>Signed-off-by: Idwer Vollering &lt;<a href="mailto:vidwer@gmail.com" target="_blank">vidwer@gmail.com</a>&gt;<br>