Merge branch 'master' into easyrails_live