Merge branch 'master' into types
Merge branch 'types' of https://github.com/aruto/sansaku_semi