Avoid being dependent on Boost.PP.
Removed some extra spaces.
Merge branch 'develop'