Development

Sorry, that pull request was an unintentional, please cancel.  Not quite ready to push anything upstream.  

My two-year-old was crawling over my keyboard :)