Merge pull request #296 from dbellettini/2.7

2.7