Merging #1054

Just needed to bring #1054 up to master