Fix parsing of template parameters.
Fix parsing of template parameters.

robertoraggi/cplusplus,robertoraggi/cplusplus,robertoraggi/cplusplus,robertoraggi/cplusplus,robertoraggi/cplusplus,robertoraggi/cplusplus