diff --git a/ChangeLog b/ChangeLog
index fc35f8eb7..411240547 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,15 @@
+2018-01-14  Dirk Eddelbuettel  <edd@debian.org>
+
+        * inst/include/Rcpp/traits/is_na.h (Rcpp): Also speed up
+        Rcpp::is_na<Rcomplex>
+
+2018-01-11  Kirill Müller  <krlmlr@mailbox.org>
+
+        * inst/include/Rcpp/traits/is_na.h: Speed up Rcpp::is_na<double>()
+
 2018-01-09  Iñaki Ucar  <i.ucar86@gmail.com>
 
         * inst/include/Rcpp/vector/proxy.h: Improve support for NVCC, the CUDA
-        compiler (pull request #798, fixed issue #797)
 
 2018-01-06  Kendon Bell  <kmb56@berkeley.edu>
 
diff --git a/DESCRIPTION b/DESCRIPTION
index d225cc9cf..6c4d96c32 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 0.12.14.5
-Date: 2017-12-21
+Version: 0.12.14.6
+Date: 2018-01-14
 Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, Qiang Kou,
  Nathan Russell, Douglas Bates and John Chambers
 Maintainer: Dirk Eddelbuettel <edd@debian.org>
diff --git a/inst/include/Rcpp/traits/is_na.h b/inst/include/Rcpp/traits/is_na.h
index bc96d4b2e..b2002209b 100644
--- a/inst/include/Rcpp/traits/is_na.h
+++ b/inst/include/Rcpp/traits/is_na.h
@@ -2,7 +2,8 @@
 //
 // is_na.h: Rcpp R/C++ interface class library -- vector operators
 //
-// Copyright (C) 2010 - 2013 Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2018 Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2018        Dirk Eddelbuettel and Kirill Mueller
 //
 // This file is part of Rcpp.
 //
@@ -39,13 +40,12 @@ namespace Rcpp{
 
         template <>
         inline bool is_na<REALSXP>(double x) {
-            return internal::Rcpp_IsNA(x) || internal::Rcpp_IsNaN(x);
+            return R_isnancpp(x);
         }
 
         template <>
         inline bool is_na<CPLXSXP>(Rcomplex x) {
-            return internal::Rcpp_IsNA(x.r) || internal::Rcpp_IsNA(x.i) ||
-              internal::Rcpp_IsNaN(x.r) || internal::Rcpp_IsNaN(x.i);
+            return R_isnancpp(x.r) || R_isnancpp(x.i);
         }
 
         template <>