Merge rawstrap and master