Test refactoring!
Merge branch 'master' of https://github.com/artekem/mustached-octo-ninja into origin_master