Updates from master for github issues