5.1 backwards compatability#16

Open

cyisfor wants to merge 2 commits intowscherphof:masterfrom

Commits on Mar 10, 2014

5.1 backwards compatability
Cy
committed

Commits on Mar 28, 2014

removing tostring({}) dependence
Cy
committed