Merge branch 'develop'

# Conflicts:
#	config/version.php

Author: snipe

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v4.6.0',
-  'full_app_version' => 'v4.6.0 - build 3710-g961741b80',
-  'build_version' => '3710',
+  'app_version' => 'v4.6.1',
+  'full_app_version' => 'v4.6.1 - build 3842-gbbb15d610',
+  'build_version' => '3842',
   'prerelease_version' => '',
-  'hash_version' => 'g961741b80',
-  'full_hash' => 'v4.6.0-3-g961741b80',
+  'hash_version' => 'gbbb15d610',
+  'full_hash' => 'v4.6.0-10-gbbb15d610',
   'branch' => 'master',
 );