Merge branch 'Plasma/5.12'

Authored by hein on Mar 28 2018, 4:54 AM.

Description

Merge branch 'Plasma/5.12'

Merged Changes

CommitAuthorDetailsCommitted
20bcc8f0501bD10736hein
Do clamping in the model and add missing lower bound check 
Mar 28 2018
003a936320f4 jriddell
Update version number for 5.12.4 GIT_SILENT 
Mar 27 2018