Merge pull request #686 from abinoam/master

Fix tiny typo on mod/uimport.php
fix 540 in vier
Merge pull request #687 from tobiasd/bug_540

fix 540 in vier