Update files to version 2012030501
Updated to version 2012092401
Updated to version 2012092401
Merging v2012030501 from master
Merging v2012092401 from master