Merge commit 'origin/bug_494_disable_automatic_ipkgupdate'