Avoid structures that will do needed to compile with g++ version 4.7
Merge branch 'migrate_to_gcc_4_5' into develop