Merge stable
Merge stable
Push to github

--HG--
branch : stable
Type 'single' support.

--HG--
branch : stable
With newer versions of python-magic, use keep_going flag for drilling down to
most precise mime type.

--HG--
branch : stable
Allow for locking around python-magic.

--HG--
branch : stable
tidyup fixup plugin args
allow user to specific naming templates in fixup plugin
merge stable
tidyup fixup plugin args
allow user to specific naming templates in fixup plugin
fixed merge conflicts
Merge Matt Black's file/dir rename patter for fixup (+ a mime type fix)

--HG--
branch : stable
Preserve file and directory file timestamps.

--HG--
branch : stable