Base code upload
"Merge latest 2014.05.15"