Merge into master robfig/revel