Merging change from
https://github.com/lognormal/boomerang/commit/8a20b4bd9a66e18ae9561981e06511d0259a027a
Generated new files