Merging up from dev to stage

With fix for #123