Merge branch '1080145-continue-landfill' of github.com:davidbgk/olympia into 1080145-continue-landfill