New upstream

Includes hspec-checkers