This is just some code being moved around.
rebased onto ac8f4b08e7736bd54cebf78c527eaa6c4c26988b
Pull-Request has been merged by abompard
This is just some code being moved around.