swos-/lod — pull request #3 by swos- (2014-10-19 13:10:46+00:00)
Title: Master to develop

Merged incorrectly. Not merging master changes with develop.