Requesting a pull to gvn:master from k88hudson:fixes