Merge branch 'essentials' into all

This commit is contained in:
Jonas Bernoulli
2017-04-19 00:44:41 +02:00