One last item for 1.8.
Merge branch 'master' of github.com:tamentis/prwd