Ensure icons stay working
Ensure icons stay working
Ensure icons stay working
Ensure icons stay working
Merge remote-tracking branch 'origin/master' into webpack-dev-server

Conflicts:
	package.json