diff --git a/Eigen/src/Core/DiagonalMatrix.h b/Eigen/src/Core/DiagonalMatrix.h
index 405cc712f..3c389b972 100644
--- a/Eigen/src/Core/DiagonalMatrix.h
+++ b/Eigen/src/Core/DiagonalMatrix.h
@@ -72,6 +72,13 @@ class DiagonalBase : public EigenBase<Derived>
     EIGEN_DEVICE_FUNC
     inline DiagonalVectorType& diagonal() { return derived().diagonal(); }
 
+    /** \returns the value of the coefficient as if \c *this was a dense matrix. */
+    EIGEN_DEVICE_FUNC
+    inline Scalar coeff(Index row, Index col) const {
+      eigen_assert(row >= 0 && col >= 0 && row < rows() && col <= cols());
+      return row == col ? diagonal().coeff(row) : Scalar(0);
+    }
+
     /** \returns the number of rows. */
     EIGEN_DEVICE_FUNC EIGEN_CONSTEXPR 
     inline Index rows() const { return diagonal().size(); }
diff --git a/Eigen/src/Core/IO.h b/Eigen/src/Core/IO.h
index 897d7b09a..053905fe2 100644
--- a/Eigen/src/Core/IO.h
+++ b/Eigen/src/Core/IO.h
@@ -253,6 +253,11 @@ std::ostream & operator <<
   return internal::print_matrix(s, m.eval(), EIGEN_DEFAULT_IO_FORMAT);
 }
 
+template <typename Derived>
+std::ostream& operator<<(std::ostream& s, const DiagonalBase<Derived>& m) {
+  return internal::print_matrix(s, m.derived(), EIGEN_DEFAULT_IO_FORMAT);
+}
+
 } // end namespace Eigen
 
 #endif // EIGEN_IO_H