copy from local master, stable, pre-beta
Merge branch 'master' of https://github.com/jschelle/loki