Fix building on GCC 4.4.
Styling.
Merge branch 'v0.11'