Not really related to this pull, but I moved it to 1.6 since these changes have already been merged into master