Upgrade aloha to version 0.23.12
Merge branch 'aloha'