Merge remote-tracking branch 'dm/opendreambox-1.6' into test_0701