Result of merge from branch/tag 'rel-1-5'
Removed encoding information.
Todos towards release 1.5
Eggified version.