Pull Request 2#2

OddBloke wants to merge 2 commits into

masteroctomanager/test-repo:masterfrom

other_testoctomanager/test-repo:other_testCopy head branch name to clipboard