Merge from hardkernel svn repository