Merge branch 'release-candidate' into stable

Authored by featherless on Apr 19 2017, 5:43 PM.

Description

Merge branch 'release-candidate' into stable

Merged Changes

CommitAuthorDetailsCommitted
0de198d368dcfeatherless
Add missing imports. 
Apr 19