I merged these last two pull requests myself because they ended up in the wrong order (I only managed to create the chronologically first request after the second was already logged). So to avoid conflicts I merged them in correct chronological order.