qp js
Merge remote-tracking branch 'maanu/master'