---
 lisp/cus-face.el |    6 +++++-
 lisp/startup.el  |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

--- lisp/cus-face.el
+++ lisp/cus-face.el	2015-07-10 10:52:20.177518702 +0000
@@ -42,6 +42,9 @@
 (eval-when-compile
   (require 'font))
 
+;; Simply to apply any custom faces
+(autoload 'initialize-custom-faces "faces")
+
 ;;; Declaring a face.
 
 ;;;###autoload
@@ -336,7 +339,8 @@ and non-nil, FACE will also be created a
 COMMENT is a string comment about FACE.
 
 See `defface' for the format of SPEC."
-  (apply #'custom-theme-set-faces 'user args))
+  (apply #'custom-theme-set-faces 'user args)
+  (initialize-custom-faces))
 
 ;;;###autoload
 (defun custom-theme-set-faces (theme &rest args)
--- lisp/startup.el
+++ lisp/startup.el	2015-07-13 11:14:12.609518333 +0000
@@ -1101,7 +1101,7 @@ exact problem."
 Currently this does nothing but call `load', but it might be redefined
 in the future to support automatically converting older options files to
 a new format, when variables have changed, etc."
-  (load filename))
+  (load filename t))
 
 (defun command-line-1 ()
   (cond