Bug1011

This is a request for a pull.