Renditioning fix
Merge pull request #182 from tmughal/master

Renditioning fix
Merge pull request #183 from mikeh/master

MOBSDK-615, MOBSDK-618