fixes #547
Merge branch 'master' of github.com:bitovi/canjs