Merging master
Merge branch 'tasks'

* tasks:
  Merging master