Fixed version number conflict following merge of master.
Fixed version number conflict following merge of master.

terrycojones/dark-matter,bamueh/dark-matter,bamueh/dark-matter,acorg/dark-matter,acorg/dark-matter,terrycojones/dark-matter