Merge remote-tracking branch 'origin/master' into develop

src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C

@@ -259,7 +259,7 @@ Foam::label Foam::primitiveEntry::startLineNumber() const
 
     if (tokens.size())
     {
-        tokens.first().lineNumber();
+        return tokens.first().lineNumber();
     }
 
     return -1;

src/finiteVolume/fields/fvPatchFields/derived/scaledFixedValue/scaledFixedValueFvPatchField.H

@@ -55,7 +55,7 @@ Usage
             (100.0 1.0)
         );
 
-        patch
+        refValue
         {
             type            fixedValue;
             value           uniform (15 0 0);