End docblocks with */ instead of **/
Merge remote-tracking branch 'upstream/master'