cleanup, github import
summary
a bunch of stuff
a bunch of stuff
summary
(cherry picked from commit d50637c)
Merge branch 'master' into fixhead

Conflicts:
	.idea/workspace.xml
summary
(cherry picked from commit d50637c)
summary
(cherry picked from commit d50637c)
Merge remote-tracking branch 'origin/master' into fixhead
fix