matching the get/set changes in core
making sure $helpers isn't public
removing dev-master alias
Merge branch 'dev'