Definition Updates.
Merge pull request #1334 from clark-stevenson/dev

Definition Updates.