Merge branch 'unset_variables' into ycm-0.1