Set version to 2.6.1-dev
Fix Scrutinizer issues (documented return type)