Merged eclipse:master into qivicon:master