Merge pull request #1441 from stevepiercy/1.5-branch

backport #1320 and Pylons@09beb29 from master to 1.5
move bugfixes above docs changes