Minor commit to sync master back with dev.

Signed-off-by: Zane M. Kolnik <zanematthew@gmail.com>
Merge branch 'refs/heads/dev'