Merged in the parts of raiseable done on the develop branch.
Merge branch 'raise' into develop