stash popped
Merge that shit
Merge again
Use our generator.
Merge commit 'c0de244063df359a6cd782d2a11a02216ae63e40'