removing the tailing comma so that it can be minimized by google closure
Merge remote-tracking branch 'origin/master'