Merge branch 'develop'
Version bump and warning!
Merge branch 'develop'
Version bump.
More specs.
Don't ask me why I didn't make the names the same as the constants.