HOTFIX: function no longer exists
Merge remote-tracking branch 'origin/master'