Added missing newline at end of file.
Fixed tests for optional initialization in tests, under recent versions of clang.
Merge branch 'develop'