Made compile on CentOS 6.4, g++ 4.4.7, removing extraneous typename keywords.
Merge branch 'v1.6.x' into sam_1011