Merge branch 'nether' into tizen