Pull upstream master

merge upstream master (voxxit/opensrs)