diff --git a/Modules/Compatibility/Deprecated/include/itkAnalyzeImageIO.h b/Modules/Compatibility/Deprecated/include/itkAnalyzeImageIO.h
index 2d34478d39d..badaebf5c4f 100644
--- a/Modules/Compatibility/Deprecated/include/itkAnalyzeImageIO.h
+++ b/Modules/Compatibility/Deprecated/include/itkAnalyzeImageIO.h
@@ -186,16 +186,16 @@ class ITK_EXPORT AnalyzeImageIO:public ImageIOBase
   void SwapBytesIfNecessary(void *buffer, SizeType numberOfPixels);
 
 /**
- * \author Hans J. Johnson
  * Performs byte swapping of the Analyze Image header if necessary.
+ * \author Hans J. Johnson
  * \param imageheader An Analyze 7.5 compliant image header.
  * \return void
  */
   void SwapHeaderBytesIfNecessary(struct dsr *const imageheader);
 
 /**
- * \author Hans J. Johnson
  * Defines the header object data type feilds according to Analyze v7.5 specifications
+ * \author Hans J. Johnson
  * \return nothing
  */
   void  DefineHeaderObjectDataType(void);
@@ -215,9 +215,9 @@ class ITK_EXPORT AnalyzeImageIO:public ImageIOBase
     unsigned int zsize;
   };
 /**
- * \author Kent Williams
  * Get values needed to re-orient image data to
  * Coronal scan order
+ * \author Kent Williams
  * \param dim - structure to fill in
  * \return nothing
  */
@@ -226,8 +226,8 @@ class ITK_EXPORT AnalyzeImageIO:public ImageIOBase
   ipl_dimensions m_OldDim, m_NewDim;
 #endif
 /**
- * \author Hans J. Johnson
  * Check the endedness of the header file.
+ * \author Hans J. Johnson
  * \param temphdr - a reference to the header structure
  * \return The endedness of the file
  */
diff --git a/Modules/Compatibility/Deprecated/test/itkTestDriverIncludeDeprecatedIOFactories.h b/Modules/Compatibility/Deprecated/test/itkTestDriverIncludeDeprecatedIOFactories.h
index b910805bd3b..7d48938b983 100644
--- a/Modules/Compatibility/Deprecated/test/itkTestDriverIncludeDeprecatedIOFactories.h
+++ b/Modules/Compatibility/Deprecated/test/itkTestDriverIncludeDeprecatedIOFactories.h
@@ -23,7 +23,10 @@
 #include "itkNiftiImageIOFactory.h"
 #include "itkGiplImageIOFactory.h"
 #include "itkJPEGImageIOFactory.h"
-#include "itkLSMImageIOFactory.h"
+#include "itk_tiff.h" // ITK_USE_SYSTEM_TIFF
+#ifndef ITK_USE_SYSTEM_TIFF
+#  include "itkLSMImageIOFactory.h"
+#endif // ITK_USE_SYSTEM_TIFF
 #include "itkMetaImageIOFactory.h"
 #include "itkPNGImageIOFactory.h"
 #include "itkNrrdImageIOFactory.h"
@@ -43,7 +46,9 @@ void ProcessArgumentsAndRegisterDeprecatedIOFactories(int *ac, ArgumentStringTyp
   itk::ObjectFactoryBase::RegisterFactory( itk::PNGImageIOFactory::New() );
   itk::ObjectFactoryBase::RegisterFactory( itk::VTKImageIOFactory::New() );
   itk::ObjectFactoryBase::RegisterFactory( itk::GiplImageIOFactory::New() );
+#ifndef ITK_USE_SYSTEM_TIFF
   itk::ObjectFactoryBase::RegisterFactory( itk::LSMImageIOFactory::New() );
+#endif // ITK_USE_SYSTEM_TIFF
   itk::ObjectFactoryBase::RegisterFactory( itk::NiftiImageIOFactory::New() );
   itk::ObjectFactoryBase::RegisterFactory( itk::JPEGImageIOFactory::New() );
   itk::ObjectFactoryBase::RegisterFactory( itk::TIFFImageIOFactory::New() );
diff --git a/Modules/Core/Common/include/itkImageToImageFilter.h b/Modules/Core/Common/include/itkImageToImageFilter.h
index bb668ea064c..8bca89597fc 100644
--- a/Modules/Core/Common/include/itkImageToImageFilter.h
+++ b/Modules/Core/Common/include/itkImageToImageFilter.h
@@ -172,6 +172,7 @@ class ITK_EXPORT ImageToImageFilter:public ImageSource< TOutputImage >
    */
   itkSetMacro(CoordinateTolerance,double);
   itkGetMacro(CoordinateTolerance,double);
+
   /** get/set the direction tolerance
    *  This tolerance is used to make sure that all input
    *  images are oriented the same before performing the filter's
@@ -179,6 +180,7 @@ class ITK_EXPORT ImageToImageFilter:public ImageSource< TOutputImage >
    */
   itkSetMacro(DirectionTolerance,double);
   itkGetMacro(DirectionTolerance,double);
+
 protected:
   ImageToImageFilter();
   ~ImageToImageFilter();
diff --git a/Modules/Core/Common/include/itkLogOutput.h b/Modules/Core/Common/include/itkLogOutput.h
index c57afda7a11..c3ccbf5521f 100644
--- a/Modules/Core/Common/include/itkLogOutput.h
+++ b/Modules/Core/Common/include/itkLogOutput.h
@@ -27,7 +27,7 @@
 namespace itk
 {
 /** \class LogOutput
- *  \brief Represents an output stream.
+ * \brief Represents an output stream.
  *
  *  \author Hee-Su Kim, Compute Science Dept. Kyungpook National University,
  *                      ISIS Center, Georgetown University.
diff --git a/Modules/Core/Common/include/itkMetaDataObject.h b/Modules/Core/Common/include/itkMetaDataObject.h
index 0c5156f32a5..cb753842907 100644
--- a/Modules/Core/Common/include/itkMetaDataObject.h
+++ b/Modules/Core/Common/include/itkMetaDataObject.h
@@ -86,52 +86,51 @@ class ITK_EXPORT MetaDataObject:public MetaDataObjectBase
   itkTypeMacro(MetaDataObject, MetaDataObjectBase);
 
   /**
-   * \author Hans J. Johnson
    * Default constructor with no initialization.
+   * \author Hans J. Johnson
    */
   MetaDataObject(void);
-  /** \author Hans J. Johnson
+  /**
    * Default virtual Destructor
+   * \author Hans J. Johnson
    */
   virtual ~MetaDataObject(void);
   /**
-   * \author Hans J. Johnson
    * Initializer constructor that sets m_MetaDataObjectValue to InitializerValue
+   * \author Hans J. Johnson
    */
   MetaDataObject(const MetaDataObjectType InitializerValue);
   /**
-   * \author Hans J. Johnson
    * Copy constructor that sets m_MetaDataObjectValue to TemplateObject.m_MetaDataObjectValue
+   * \author Hans J. Johnson
    */
   MetaDataObject(const MetaDataObject< MetaDataObjectType > & TemplateObject);
   /**
-   * \author Hans J. Johnson
-   *
    * The definition of this function is necessary to fulfill
    * the interface of the MetaDataObjectBase
+   * \author Hans J. Johnson
    * \return A pointer to a const char array containing the unique type name.
    */
   virtual const char * GetMetaDataObjectTypeName(void) const;
 
   /**
-   * \author Hans J. Johnson
-   *
    * The definition of this function is necessary to fulfill
    * the interface of the MetaDataObjectBase
+   * \author Hans J. Johnson
    * \return A constant reference to a std::type_info object
    */
   virtual const std::type_info & GetMetaDataObjectTypeInfo(void) const;
 
   /**
-   * \author Hans J. Johnson
    * Function to return the stored value of type MetaDataObjectType.
+   * \author Hans J. Johnson
    * \return a constant reference to a MetaDataObjectType
    */
   const MetaDataObjectType & GetMetaDataObjectValue(void) const;
 
   /**
-   * \author Hans J. Johnson
    * Function to set the stored value of type MetaDataObjectType.
+   * \author Hans J. Johnson
    * \param NewValue A constant reference to at MetaDataObjectType.
    */
   void SetMetaDataObjectValue(const MetaDataObjectType & NewValue);
@@ -143,12 +142,13 @@ class ITK_EXPORT MetaDataObject:public MetaDataObjectBase
   virtual void Print(std::ostream & os) const;
 
 private:
-  //This is made private to force the use of the
+  // This is made private to force the use of the
   // MetaDataObject<MetaDataObjectType>::New() operator!
   //void * operator new(SizeValueType nothing) {};//purposefully not implemented
+
   /**
-   * \author Hans J. Johnson
    * A variable to store this derived type.
+   * \author Hans J. Johnson
    */
   MetaDataObjectType m_MetaDataObjectValue;
 };
diff --git a/Modules/Core/Common/include/itkMultipleLogOutput.h b/Modules/Core/Common/include/itkMultipleLogOutput.h
index fede059e0d6..7db2e55001b 100644
--- a/Modules/Core/Common/include/itkMultipleLogOutput.h
+++ b/Modules/Core/Common/include/itkMultipleLogOutput.h
@@ -26,14 +26,14 @@
 namespace itk
 {
 /** \class MultipleLogOutput
- *  \brief Allows writing simultaneously to multiple streams. Note that the
- *         class derives from std::streambuf and contains a
- *         std::set<> of LogOutput.
+ * \brief Allows writing simultaneously to multiple streams. Note that the
+ *        class derives from std::streambuf and contains a
+ *        std::set<> of LogOutput.
  *
  * \author Hee-Su Kim, Compute Science Dept. Kyungpook National University,
  *                     ISIS Center, Georgetown University.
  *
- *  \ingroup OSSystemObjects LoggingObjects
+ * \ingroup OSSystemObjects LoggingObjects
  * \ingroup ITKCommon
  */
 
diff --git a/Modules/Core/Common/include/itkOctreeNode.h b/Modules/Core/Common/include/itkOctreeNode.h
index 46cb51c9b20..7ad4c9ad0d9 100644
--- a/Modules/Core/Common/include/itkOctreeNode.h
+++ b/Modules/Core/Common/include/itkOctreeNode.h
@@ -30,13 +30,15 @@ class OctreeBase;
  * \class OctreeNode
  * \brief A data structure representing a node in an Octree.
  *
- * OctreeNode data structure,  OctreeNodes have two states: 1) They are a Colored node and the
- * m_Branch is a sentinal value indicating the color, or 2) they are a branch node, and m_Branch
- * is a dynamically allocated array of 8 pointers to OctreeNodes.  In the second state, the 8 child
- * OctreeNodes are instantiated by the parent node.
+ * OctreeNode is the basic building block of an octree. It is rarely used by
+ * itself, and commonly used by the Octree class.
+ *
+ * OctreeNodes have two states: 1) They are a Colored node and the m_Branch is
+ * a sentinal value indicating the color, or 2) they are a branch node, and
+ * m_Branch is a dynamically allocated array of 8 pointers to OctreeNodes. In
+ * the second state, the 8 child OctreeNodes are instantiated by the parent node.
+ *
  * \author Hans J. Johnson
- * This class is the basic building block of an octree.  It is rarely used by itself, and commonly
- * used by the Octree class.
  * \todo FIXME copy & paste documentation in all methods.
  * \ingroup ITKCommon
  */
@@ -49,6 +51,7 @@ class ITKCommon_EXPORT OctreeNode
    * with values of 0.
    */
   OctreeNode(void);
+
   /**
    * Default destructor
    */
@@ -64,8 +67,9 @@ class ITKCommon_EXPORT OctreeNode
   OctreeNode & GetChild(const enum LeafIdentifier ChildID) const;
 
   OctreeNode & GetChild(const enum LeafIdentifier ChildID);
+  /** @}
+  */
 
-  /** @} */
   /**
    * Determines the color value of the specified Child for this OctreeNode
    * \pre Must determine that the specified node is colored (Use IsNodeColored()
diff --git a/Modules/Core/Transform/include/itkBSplineTransform.h b/Modules/Core/Transform/include/itkBSplineTransform.h
index 49c4b6e4d9b..03ea2b06542 100644
--- a/Modules/Core/Transform/include/itkBSplineTransform.h
+++ b/Modules/Core/Transform/include/itkBSplineTransform.h
@@ -26,7 +26,7 @@ namespace itk
  * \brief Deformable transform using a BSpline representation
  *
  * This class encapsulates a deformable transform of points from one
- * N-dimensional one space to another N-dimensional space.
+ * N-dimensional space to another N-dimensional space.
  * The deformation field is modelled using B-splines.
  * A deformation is defined on a sparse regular grid of control points
  * \f$ \vec{\lambda}_j \f$ and is varied by defining a deformation
diff --git a/Modules/Core/Transform/include/itkBSplineTransformInitializer.h b/Modules/Core/Transform/include/itkBSplineTransformInitializer.h
index a3f398f65e4..c780834124f 100644
--- a/Modules/Core/Transform/include/itkBSplineTransformInitializer.h
+++ b/Modules/Core/Transform/include/itkBSplineTransformInitializer.h
@@ -27,6 +27,10 @@ namespace itk
  * \brief BSplineTransformInitializer is a helper class intended to
  * initialize the control point grid such that it has a physically consistent
  * definition.
+ * It sets the transform domain origin, physical dimensions and direction from
+ * information obtained from the image. It also sets the mesh size if asked
+ * to do so by calling SetTransformDomainMeshSize() before calling
+ * InitializeTransform().
  *
  * \author Luis Ibanez
  * \author Nick Tustison
diff --git a/Modules/Filtering/ImageFeature/include/itkBilateralImageFilter.h b/Modules/Filtering/ImageFeature/include/itkBilateralImageFilter.h
index b384257f217..97a3a0f414f 100644
--- a/Modules/Filtering/ImageFeature/include/itkBilateralImageFilter.h
+++ b/Modules/Filtering/ImageFeature/include/itkBilateralImageFilter.h
@@ -133,6 +133,8 @@ class ITK_EXPORT BilateralImageFilter:
    * RangeSigma is specified in the units of intensity. */
   itkSetMacro(DomainSigma, ArrayType);
   itkGetConstMacro(DomainSigma, const ArrayType);
+  itkSetMacro(DomainMu, double);
+  itkGetConstReferenceMacro(DomainMu, double);
   itkSetMacro(RangeSigma, double);
   itkGetConstMacro(RangeSigma, double);
   itkGetConstMacro(FilterDimensionality, unsigned int);
@@ -175,24 +177,13 @@ class ITK_EXPORT BilateralImageFilter:
 #endif
 
 protected:
-  /** Constructor.  Default value for DomainSigma is 4. Default value
-   * RangeSigma is 50. */
-  BilateralImageFilter()
-  {
-    m_Radius.Fill(1);
-    m_AutomaticKernelSize = true;
-    m_DomainSigma.Fill(4.0);
-    m_RangeSigma = 50.0;
-    m_FilterDimensionality = ImageDimension;
-    m_NumberOfRangeGaussianSamples = 100;
-    m_DynamicRange = 0.0;
-    m_DynamicRangeUsed = 0.0;
-    m_DomainMu = 2.5;  // keep small to keep kernels small
-    m_RangeMu = 4.0;   // can be bigger then DomainMu since we only
-                       // index into a single table
-  }
+  /** Constructor. */
+  BilateralImageFilter();
 
+  /** Destructor. */
   virtual ~BilateralImageFilter() {}
+
+  /** PrintSelf. */
   void PrintSelf(std::ostream & os, Indent indent) const;
 
   /** Do some setup before the ThreadedGenerateData */
diff --git a/Modules/Filtering/ImageFeature/include/itkBilateralImageFilter.hxx b/Modules/Filtering/ImageFeature/include/itkBilateralImageFilter.hxx
index 19130ed2f9e..6d0b9d2d554 100644
--- a/Modules/Filtering/ImageFeature/include/itkBilateralImageFilter.hxx
+++ b/Modules/Filtering/ImageFeature/include/itkBilateralImageFilter.hxx
@@ -28,6 +28,23 @@
 
 namespace itk
 {
+template< class TInputImage, class TOutputImage >
+BilateralImageFilter< TInputImage, TOutputImage >
+::BilateralImageFilter()
+{
+  this->m_Radius.Fill(1);
+  this->m_AutomaticKernelSize = true;
+  this->m_DomainSigma.Fill(4.0);
+  this->m_RangeSigma = 50.0;
+  this->m_FilterDimensionality = ImageDimension;
+  this->m_NumberOfRangeGaussianSamples = 100;
+  this->m_DynamicRange = 0.0;
+  this->m_DynamicRangeUsed = 0.0;
+  this->m_DomainMu = 2.5;  // keep small to keep kernels small
+  this->m_RangeMu = 4.0;   // can be bigger then DomainMu since we only
+                           // index into a single table
+}
+
 template< class TInputImage, class TOutputImage >
 void
 BilateralImageFilter< TInputImage, TOutputImage >
diff --git a/Modules/Filtering/ImageFeature/test/itkBilateralImageFilterTest.cxx b/Modules/Filtering/ImageFeature/test/itkBilateralImageFilterTest.cxx
index 6dc0453dec1..ed28f735d5e 100644
--- a/Modules/Filtering/ImageFeature/test/itkBilateralImageFilterTest.cxx
+++ b/Modules/Filtering/ImageFeature/test/itkBilateralImageFilterTest.cxx
@@ -35,6 +35,7 @@ int itkBilateralImageFilterTest(int, char* [] )
         filter = itk::BilateralImageFilter<ImageType,
         ImageType>::New();
       filter->SetDomainSigma(2.0);
+      filter->SetDomainMu(2.5);
       filter->SetRangeSigma(35.0f);
 
       // Run Test
diff --git a/Modules/Filtering/ImageFeature/test/itkBilateralImageFilterTest2.cxx b/Modules/Filtering/ImageFeature/test/itkBilateralImageFilterTest2.cxx
index 03611579354..6b2cd8e3112 100644
--- a/Modules/Filtering/ImageFeature/test/itkBilateralImageFilterTest2.cxx
+++ b/Modules/Filtering/ImageFeature/test/itkBilateralImageFilterTest2.cxx
@@ -49,7 +49,7 @@ int itkBilateralImageFilterTest2(int ac, char* av[] )
   // when the original signal to noise level is 5
   filter->SetDomainSigma( 4.0 );
   filter->SetRangeSigma( 50.0 );
-
+  filter->SetDomainMu(2.5);
 
   // Test itkSetVectorMacro
   double domainSigma[dimension];
@@ -75,6 +75,8 @@ int itkBilateralImageFilterTest2(int ac, char* av[] )
   std::cout << "filter->GetFilterDimensionality(): " << filterDimensionality2 << std::endl;
   unsigned long numberOfRangeGaussianSamples2 = filter->GetNumberOfRangeGaussianSamples();
   std::cout << "filter->GetNumberOfRangeGaussianSamples(): " << numberOfRangeGaussianSamples2 << std::endl;
+  double domainMu = filter->GetDomainMu();
+  std::cout << "filter->GetDomainMu(): " << domainMu << std::endl;
 
   try
     {
diff --git a/Modules/Filtering/ImageFeature/test/itkBilateralImageFilterTest3.cxx b/Modules/Filtering/ImageFeature/test/itkBilateralImageFilterTest3.cxx
index 3457cc29f0b..b3a976b3e3b 100644
--- a/Modules/Filtering/ImageFeature/test/itkBilateralImageFilterTest3.cxx
+++ b/Modules/Filtering/ImageFeature/test/itkBilateralImageFilterTest3.cxx
@@ -59,10 +59,13 @@ int itkBilateralImageFilterTest3(int ac, char* av[] )
     // the edges are preserved better.
     filter1->SetDomainSigma( 4.0 );
     filter1->SetRangeSigma( 20.0 );
+    filter1->SetDomainMu( 2.5 );
     filter2->SetDomainSigma( 4.0 );
     filter2->SetRangeSigma( 20.0 );
+    filter2->SetDomainMu( 2.5 );
     filter3->SetDomainSigma( 4.0 );
     filter3->SetRangeSigma( 20.0 );
+    filter3->SetDomainMu( 2.5 );
 
   try
     {
diff --git a/Modules/Filtering/ImageStatistics/include/itkBinaryProjectionImageFilter.h b/Modules/Filtering/ImageStatistics/include/itkBinaryProjectionImageFilter.h
index 475a456cfa7..78502db7914 100644
--- a/Modules/Filtering/ImageStatistics/include/itkBinaryProjectionImageFilter.h
+++ b/Modules/Filtering/ImageStatistics/include/itkBinaryProjectionImageFilter.h
@@ -27,14 +27,12 @@ namespace itk
  * \brief Binary projection
  *
  * This class was contributed to the Insight Journal by Gaetan Lehmann.
- * the original paper can be found at
+ * The original paper can be found at
  *   http://hdl.handle.net/1926/164
  *
- *
  * \author Gaetan Lehmann. Biologie du Developpement et de la Reproduction,
  *  INRA de Jouy-en-Josas, France.
  *
- *
  * \sa ProjectionImageFilter
  * \sa MedianProjectionImageFilter
  * \sa MeanProjectionImageFilter
diff --git a/Modules/Filtering/ImageStatistics/include/itkMaximumProjectionImageFilter.h b/Modules/Filtering/ImageStatistics/include/itkMaximumProjectionImageFilter.h
index aabd6c72733..3b9d0736f4d 100644
--- a/Modules/Filtering/ImageStatistics/include/itkMaximumProjectionImageFilter.h
+++ b/Modules/Filtering/ImageStatistics/include/itkMaximumProjectionImageFilter.h
@@ -26,8 +26,8 @@ namespace itk
 /** \class MaximumProjectionImageFilter
  * \brief Maximum projection
  *
- * this class was contributed to the insight journal by Gaetan Lehmann.
- * the original paper can be found at
+ * This class was contributed to the insight journal by Gaetan Lehmann.
+ * The original paper can be found at
  *    http://hdl.handle.net/1926/164
  *
  * \author Gaetan Lehmann. Biologie du Developpement et de la reproduction,
diff --git a/Modules/Filtering/ImageStatistics/include/itkMeanProjectionImageFilter.h b/Modules/Filtering/ImageStatistics/include/itkMeanProjectionImageFilter.h
index 63d4ad02d6f..47fa5ce4baf 100644
--- a/Modules/Filtering/ImageStatistics/include/itkMeanProjectionImageFilter.h
+++ b/Modules/Filtering/ImageStatistics/include/itkMeanProjectionImageFilter.h
@@ -33,7 +33,6 @@ namespace itk
  * \author Gaetan Lehmann. Biologie du Developpement et de la Reproduction,
  * INRA de Jouy-en-Josas, France.
  *
- *
  * \sa ProjectionImageFilter
  * \sa MedianProjectionImageFilter
  * \sa MinimumProjectionImageFilter
diff --git a/Modules/Filtering/ImageStatistics/include/itkMedianProjectionImageFilter.h b/Modules/Filtering/ImageStatistics/include/itkMedianProjectionImageFilter.h
index ff2145470e8..e14317ab8f9 100644
--- a/Modules/Filtering/ImageStatistics/include/itkMedianProjectionImageFilter.h
+++ b/Modules/Filtering/ImageStatistics/include/itkMedianProjectionImageFilter.h
@@ -33,7 +33,6 @@ namespace itk
  * The original paper can be found at
  *      http://hdl.handle.net/1926/164
  *
- *
  * \author Gaetan Lehmann. Biologie du Developpement et de la Reproduction,
  * INRA de Jouy-en-Josas, France.
  *
diff --git a/Modules/Filtering/ImageStatistics/include/itkMinimumProjectionImageFilter.h b/Modules/Filtering/ImageStatistics/include/itkMinimumProjectionImageFilter.h
index 080e8acf0f5..8b1eadef816 100644
--- a/Modules/Filtering/ImageStatistics/include/itkMinimumProjectionImageFilter.h
+++ b/Modules/Filtering/ImageStatistics/include/itkMinimumProjectionImageFilter.h
@@ -30,7 +30,6 @@ namespace itk
  * The original paper can be found at
  *      http://hdl.handle.net/1926/164
  *
- *
  * \author Gaetan Lehmann. Biologie du Developpement et de la Reproduction,
  * INRA de Jouy-en-Josas, France.
  *
diff --git a/Modules/Filtering/ImageStatistics/include/itkProjectionImageFilter.h b/Modules/Filtering/ImageStatistics/include/itkProjectionImageFilter.h
index e18d412bd07..3388f97a5c5 100644
--- a/Modules/Filtering/ImageStatistics/include/itkProjectionImageFilter.h
+++ b/Modules/Filtering/ImageStatistics/include/itkProjectionImageFilter.h
@@ -46,9 +46,8 @@ namespace itk
  * \author Gaetan Lehmann. Biologie du Developpement et de la Reproduction,
  * INRA de Jouy-en-Josas, France.
  *
- *
  * \sa AccumulateImageFilter
- * \ingroup   IntensityImageFilters     SingelThreaded
+ * \ingroup IntensityImageFilters SingelThreaded
  * \ingroup ITKImageStatistics
  */
 template< class TInputImage, class TOutputImage, class TAccumulator >
diff --git a/Modules/Filtering/ImageStatistics/include/itkStandardDeviationProjectionImageFilter.h b/Modules/Filtering/ImageStatistics/include/itkStandardDeviationProjectionImageFilter.h
index b914944be8a..06f6061ed8d 100644
--- a/Modules/Filtering/ImageStatistics/include/itkStandardDeviationProjectionImageFilter.h
+++ b/Modules/Filtering/ImageStatistics/include/itkStandardDeviationProjectionImageFilter.h
@@ -33,7 +33,6 @@ namespace itk
  * \author Gaetan Lehmann. Biologie du Developpement et de la Reproduction,
  * INRA de Jouy-en-Josas, France.
  *
- *
  * \sa ProjectionImageFilter
  * \sa MedianProjectionImageFilter
  * \sa MeanProjectionImageFilter
diff --git a/Modules/Filtering/ImageStatistics/include/itkSumProjectionImageFilter.h b/Modules/Filtering/ImageStatistics/include/itkSumProjectionImageFilter.h
index a81804860d4..9bcea936740 100644
--- a/Modules/Filtering/ImageStatistics/include/itkSumProjectionImageFilter.h
+++ b/Modules/Filtering/ImageStatistics/include/itkSumProjectionImageFilter.h
@@ -30,8 +30,8 @@ namespace itk
  * The original paper can be found at
  *      http://hdl.handle.net/1926/164
  *
- * \author Gaetan Lehmann. Biologie du Developpement et de la Reproduction
- * , INRA de Jouy-en-Josas, France.
+ * \author Gaetan Lehmann. Biologie du Developpement et de la Reproduction,
+ * INRA de Jouy-en-Josas, France.
  *
  * \sa ProjectionImageFilter
  * \sa MedianProjectionImageFilter
diff --git a/Modules/Filtering/LabelMap/include/itkAttributeLabelObject.h b/Modules/Filtering/LabelMap/include/itkAttributeLabelObject.h
index 3b2196c41fc..0fe1492f4d3 100644
--- a/Modules/Filtering/LabelMap/include/itkAttributeLabelObject.h
+++ b/Modules/Filtering/LabelMap/include/itkAttributeLabelObject.h
@@ -61,7 +61,7 @@ class ITK_EXPORT AttributeLabelObjectAccessor
  * http://hdl.handle.net/1926/584  or
  * http://www.insight-journal.org/browse/publication/176
  *
- *\sa LabelObject, ShapeLabelObject, StatisticsLabelObject
+ * \sa LabelObject, ShapeLabelObject, StatisticsLabelObject
  *
  * \ingroup DataRepresentation
  * \ingroup ITKLabelMap
diff --git a/Modules/Numerics/Statistics/include/itkScalarImageToCooccurrenceMatrixFilter.h b/Modules/Numerics/Statistics/include/itkScalarImageToCooccurrenceMatrixFilter.h
index 4ea941d2362..f4677f3d3ef 100644
--- a/Modules/Numerics/Statistics/include/itkScalarImageToCooccurrenceMatrixFilter.h
+++ b/Modules/Numerics/Statistics/include/itkScalarImageToCooccurrenceMatrixFilter.h
@@ -84,7 +84,7 @@ namespace Statistics
  * \sa HistogramToTextureFeaturesFilter
  * \sa ScalarImageTextureCalculator
  *
- * \author  Zachary Pincus and Glenn Pierce
+ * \author Zachary Pincus and Glenn Pierce
  *
  * \ingroup ITKStatistics
  */
diff --git a/Modules/ThirdParty/DCMTK/CMakeLists.txt b/Modules/ThirdParty/DCMTK/CMakeLists.txt
index f1111c9c542..de51c5d97ae 100644
--- a/Modules/ThirdParty/DCMTK/CMakeLists.txt
+++ b/Modules/ThirdParty/DCMTK/CMakeLists.txt
@@ -174,6 +174,7 @@ endforeach()
 
   set(DCMTK_EP_FLAGS
     -DDCMTK_FORCE_FPIC_ON_UNIX:BOOL=ON
+    -DBUILD_APPS:BOOL=OFF        # Only DCMTK libraries are needed
     -DDCMTK_WITH_OPENSSL:BOOL=OFF
     -DDCMTK_WITH_PNG:BOOL=OFF
     -DDCMTK_WITH_XML:BOOL=OFF
diff --git a/Modules/ThirdParty/DCMTK/DCMTKGitTag.cmake b/Modules/ThirdParty/DCMTK/DCMTKGitTag.cmake
index 8a82e4c05a7..42b3b415dd8 100644
--- a/Modules/ThirdParty/DCMTK/DCMTKGitTag.cmake
+++ b/Modules/ThirdParty/DCMTK/DCMTKGitTag.cmake
@@ -2,5 +2,8 @@
 #
 # DCMTK tag brought up to 2013-01-11 to get incorporated
 # compiler fixes and bug fixes
-set(DCMTK_GIT_REPOSITORY "https://github.com/InsightSoftwareConsortium/DCMTK.git")
-set(DCMTK_GIT_TAG "8f6a406044ec8d521d3ccd19001f254d4545b2fc")
+set(DCMTK_GIT_REPOSITORY "http://github.com/InsightSoftwareConsortium/DCMTK.git")
+# this is a specific tag.  It corresponds to the symbolic tag
+# 20130129_DCMTK_PATCHES_FOR_ITK which incorporates changes needed to build and deploy
+# with ITK
+set(DCMTK_GIT_TAG "257e800c42f40ff3207a9242fa225c850c56dd07")
diff --git a/Modules/ThirdParty/DCMTK/itk-module-init.cmake b/Modules/ThirdParty/DCMTK/itk-module-init.cmake
index 6264571a0c8..6b90110e9e9 100644
--- a/Modules/ThirdParty/DCMTK/itk-module-init.cmake
+++ b/Modules/ThirdParty/DCMTK/itk-module-init.cmake
@@ -1,5 +1,6 @@
-option(ITK_USE_SYSTEM_DCMTK "Use an outside build of DCMTK." OFF)
+## Only present and build DCMTK options if ITKIODCMTK is requested
 
+option(ITK_USE_SYSTEM_DCMTK "Use an outside build of DCMTK." OFF)
 # iconv library seems to be present unpredictably, never
 # on linux, sometimes on OS X and probably never on Windows
 option(DCMTK_USE_LIBICONV "Use IConv Library in DCMTK" OFF)
diff --git a/Utilities/Maintenance/UpdateCopyrightStatementsInITK.py b/Utilities/Maintenance/UpdateCopyrightStatementsInITK.py
index 5d4cb851f2c..940bf8dd4a0 100755
--- a/Utilities/Maintenance/UpdateCopyrightStatementsInITK.py
+++ b/Utilities/Maintenance/UpdateCopyrightStatementsInITK.py
@@ -19,6 +19,7 @@
 
 #
 # \author Hans J. Johnson
+#
 # This script is designed to help change the copyright notices in all ITK files to a common format.
 # For files that are .h, .cxx, .hxx, .c, if there is no other copyright information, add the itkCopyright.
 import re