Merge branch 'develop'

LICENSE

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright [2018] [Rémi Cresson (IRSTEA)]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

include/otbTensorflowMultisourceModelLearningBase.hxx

@@ -138,7 +138,7 @@ TensorflowMultisourceModelLearningBase<TInputImage>
     // Batch start and size
     const IndexValueType sampleStart = batch * m_BatchSize;
     IndexValueType batchSize = m_BatchSize;
-    if (rest != 0)
+    if (rest != 0 && batch == nBatches - 1)
     {
       batchSize = rest;
     }