fixing all warnings in charm proof
Merge branch 'master' into trusty