Fixes #1041. Bug in P func
Fixes #1112. Cannot import `index.styl`
History up
Merge branch 'pr/1113' into rc-0.37

Conflicts:
	History.md
Merge branch 'pr/1111' into rc-0.37
History up