Merge branch 'develop' into puzzle
　
Merge branch 'puzzle' into develop