tree 9f3e7038bb56d8942769f4bd5792b3769ee0c9ec
parent 9b1dece5fc41f647c9e27770b68205b8f4c24491
author hsyed <h.a.syed@gmail.com> 1534038888 +0100
committer Hassan Syed <h.a.syed@gmail.com> 1534075118 +0100

cherry pick some changes from js branch