Merge pull request #1508 from sssopen/dev-master