Revert "Revert "Merge remote-tracking branch 'origin/master'""

This reverts commit a94a05b1ac3e43db59494364f55d9091c1c48760.
Resolve merging issues

In a failed merging, random lines such as HEAD ====, etc.. sprouted
which in essence corrupted many class files.