Merge Master into Stable

Pull in the most recent commit #249 

I did this step from the command line before, but I am thinking that using the github pull request might be more appropriate as it will create announcements to everyone and provide a place to discuss issues.