Merge branch 'experimental' of github.com:rousseau/fbrain into experimental