Merged 'master' from gregbell/active_admin