v2.4.0
2c89306c · Merge branch '2.4.0' into 'master' · Jul 31, 2018