Merge develop into master

Closes gsbodine/crowd-ed#69