Merge branch 'master' into 5739514

This commit is contained in:
Brian Lich 2016-06-02 09:01:09 -07:00
commit e95e94f95d