Merge remote-tracking branch 'origin/1.7' into 5.0

Authored by kfunk on Sep 8 2016, 11:02 AM.

Description

Merge remote-tracking branch 'origin/1.7' into 5.0

Merged Changes

CommitAuthorDetailsCommitted
c41d23ea47c2kfunk
Hotfix: Avoid crashes on branch switches 
Sep 8 2016

Empty Commit

This commit is empty and does not affect any paths.