Merged most of the 2.10.4.0 changes.
Merge branch 'master' of github.com:bogeblad/infoglue
Merge branch 'master' of github.com:bogeblad/infoglue