Merge branch 'master' into u-tests
Reverted change.
On branch u-tests
Changes to be committed:
modified:   lib/cocker.js