Fix compilation error with older versions of GCC

Older versions of GCC cannot correctly lookup the template argument
of the constructor, such as GCC 4.2 on Mac OS X.

Change-Id: I60f20c51fc4b9b1939c9215f2f336d0963a39bdb
Merge topic 'temlated-constructor' into master

b1ba5c18 Fix compilation error with older versions of GCC