Merge changes from master into Seoh

Seoh Cha authored
revision 0f2299b50a597e2f066d6c5f968106c74fadf81f