Merging development into master for v2beta1 release