2cd4ee0 Merge branch 'master' of github.com:openkratio/okioconf14