Merge branches 'beta' and 'beta' of https://github.com/phresco/commons into beta
Merge branch 'beta' of https://github.com/phresco/commons into beta