Merge pull request #2688 from dstathis/master