Merge pull request #679 from annando/develop