This change fixes a bug in the random page clicker and an IndexOutOfBoundsException.
Merge origin/master