A memory leak fix from Kristian Mört
Clang 3.4 build error fix: ambiguous constructor.