- fixed clang compile error "friend declaration specifying a default argument must be the only declaration".
Merge branch 'maint'