2013-07-14 1222: initial pull from github to merge