Merge pull request #1103 from jdaigneau/master

Canobie test