Merging `master` changes to `develop` #322

Job	Run time
test (d2q9, float, same, true)	5m 12s
test (d2q9, float, same, false)	5m 2s
test (d2q9, float, half, true)	5m 16s
test (d2q9, float, half-shift, true)	5m 40s
test (d2q9, float, float, true)	5m 18s
test (d2q9, float, float, false)	4m 58s
test (d2q9, float, float-shift, true)	5m 26s
test (d2q9, float, float-shift, false)	4m 52s
test (d2q9, double, same, true)	5m 6s
test (d2q9, double, same, false)	4m 47s
test (d2q9, double, half, true)	5m 30s
test (d2q9, double, half-shift, true)	5m 52s
test (d2q9, double, float, true)	5m 16s
test (d2q9, double, float, false)	4m 51s
test (d2q9, double, float-shift, true)	5m 4s
test (d2q9, double, float-shift, false)	4m 46s
test (d2q9, double, double, true)	5m 7s
test (d2q9, double, double, false)	4m 46s
	1h 32m 49s

Provide feedback