Merge remote-tracking branch 'origin/5.0'

Authored by kfunk on Aug 29 2016, 8:12 PM.

Description

Merge remote-tracking branch 'origin/5.0'

Merged Changes

CommitAuthorDetailsCommitted
2be5ef609784kfunk
Try to stabilize test_uicontroller test 
Aug 26 2016