Merge branch '1.1'

Authored by mwolff on May 17 2018, 11:32 AM.

Description

Merge branch '1.1'

Merged Changes

CommitAuthorDetailsCommitted
76fd2e84ba13mwolff
Fix compile on 32bit 
May 17 2018