Merging changes from develop onto master to pick up the edits for the Stardog 1.2 docs