fixed ambiguity in variant constructors for some platforms
Merge branch 'master' into DBPreparedStmts