[Libremix] Merge with svn version 0.2.4 and removal of white space.