Merge branch 'active_model'