Merge branch '5.1'

Authored by mwolff on Feb 21 2017, 10:07 PM.

Description

Merge branch '5.1'

Merged Changes

CommitAuthorDetailsCommitted
c8180003ba1fD4665bevendorff/mwolff
Fix project tree state not being saved 
Feb 21