Merge remote branch 'upstream/master'
Merge branch 'master' of https://github.com/jougs/PyNN