Merge branch 'bw_stable_wax_stack' into 'develop'

beekeeper & wax updated to stable versions

See merge request !30