Merge branch 'master' into codegen_java
Merge branch 'codegen_java' of github.com:achilleas-k/brian2 into codegen_java