now compiles on g++ 4.6.3
Merge branch 'master' into devel