Merged changes from Contribution:Dancer.