Merge branch 'hotfix/mtime' into develop

* hotfix/mtime:
  Replaced stat call with hacky inline python script
  Replaced tabs with spaces
Merge branch 'release/0.6.1'

* release/0.6.1: