imp_var now updates existing TF imp_vars (with warning)
Merge remote-tracking branch 'origin/master'