Merge remote-tracking branch 'gvdb/master'