task-806
Merge branch 'staging' of github.com:itdoors/sd into staging

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
task-806
task-806
task-767
task-767
task-650
task-766
task-799
task-799
task-799