Fortnight #5 - Merge 4.9.0
into master
#173
+2,327
−7
Merged
4.9.0
into master
#173