[golang-googlecode-go-exp/f20] Initial commit - resolves: #1148481