Rebase staging from master#345

ralphrass merged 6 commits intostagingquintoandar/butterfree:stagingfrom

rebase-staging-from-masterquintoandar/butterfree:rebase-staging-from-masterCopy head branch name to clipboard