２行翻訳
Merge branch 'develop' of github.com:sandmark/Amber into develop