Merge develop -> master for 0.5 release prep