Fixed accidential compiler issue.
Merge branch 'test' into dev