I think solves #9091
Merge branch 'issue-9091' of github.com:adamgamble/rails into issue-9091