Merge with calabash master