Commits in shapado/shapado:master