Pull request for #1299