Merged changes from hunner:master