merging from jonatkins:master