Merge tag '1.5.1'

Tagging version 1.5.1.
Merge tag '1.5.2'

Tagging 1.5.2.
Merge tag '1.5.3'

Tagging version 1.5.3.
Merge tag '1.5.4'

Tagging version 1.5.4.
Merge tag '1.5.5'

Tagging version 1.5.5.
Merge branch '1.6'.
Fix issues with hybrid.php caused by the merge.
Merge branch '1.6'
Merge branch '1.6'
Bug fix: pagination links don't work when you have a get parameter added to them