Merge branch 'master' into flexible_attributes