Merge pull request #462 from treefrogframework/master

 Update to TreeFrog Framework version 1.7