No longer a bug fix, moving towards 1.1.0