6.1
Merge branch 'master' of https://github.com/aaron218/Pictor

* 'master' of https://github.com/aaron218/Pictor:
  6.x
  6.0