Merge changes from sonicpotions 7312a0e onwards to 250c995. This is 0.25 which adds sample import from sd