php 5.3 compatibility fix.  is not available in anonymous functions until 5.4
Merge branch 'hotfix/1.0.4' into develop