Merge commit 'origin/opendreambox-1.6' into test