Use lambda and static asserts (since G++ 4.7 is supported).
Merge branch 'master' into new_display