tentative workaround for a GCC 4.4.2 problem with variadic template ctors
fixed previous fix
completed previous fix
cosmetic reformatting
Merge branch 'develop'