Merge branch '1.7'

Authored by psn on Apr 2 2017, 9:01 AM.

Description

Merge branch '1.7'

Details

Committed
psnApr 2 2017, 9:01 AM
Parents
R7:2447e8a4b607: Fix spelling in locale error message
R7:44fdc7a20bc8: Merge branch '1.7'
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
2447e8a4b607psn
Fix spelling in locale error message 
Apr 2 2017