Merge branch 'master' of https://github.com/brian-team/brian2
Merge branch 'master' of github.com:achilleas-k/brian2 into devices_android