Merge pull request #886 from vriera/develop