Merge branch 'master' into ring_buffer_overhead_calc

Conflicts:
	spynnaker/pyNN/models/neural_properties/randomDistributions.py