PR #829 fixed for 1.2.1
Unit test for #829
Fix clang warnings not related to this PR
Updated CHANGELOG [ci skip]
Merge branch 'issue-829' of git://github.com/sjinks/cphalcon into sjinks-issue-829

Conflicts:
	unit-tests/ConfigTest.php