RFC 1664 v2 & Astyle
Makefile clang edition
Merge origin/master