Merge master, fix js style issues