js was not fully merged
Merge pull request #55 from MirantisDellCrowbar/bug/js/mesa-1.6/master

js was not fully merged