Merge upstream changes from greese:develop