Merge with latest updates by James
Authored by: tchule@hotmail.com 2014-09-03
Parent: [r300]
Child: [r302]