Merge branch 'origin/develop'

* refs/remotes/origin/develop:
  needed this
tabz
remove duplication
facepalmtypo
grrrr
change from betaBlocks to just beta
moarbetastuff
merge
  moarbetastuff
  change from betaBlocks to just beta
  grrrr
  facepalmtypo
  remove duplication
  tabz