Merge branch '5.1'

Authored by kossebau on May 30 2017, 1:45 PM.

Description

Merge branch '5.1'

Merged Changes

CommitAuthorDetailsCommitted
694c333e6d44kossebau
Fix plugin settings not listing plugins from "Other" category 
May 30 2017