fixed ambigous variant constructor call
Merge branch 'master' into DBPreparedStmts