Merge branch 'release/2.1.8'

protected/config/ver.conf.php

@@ -1,5 +1,5 @@
 <?php
 
 // Version
-$config['ver'] = 'v2.1.7';
+$config['ver'] = 'v2.1.8';