Merged fork with latest original master

openmmapi/include/openmm/System.h

@@ -243,7 +243,7 @@ public:
      *
      * @return true if at least one force uses PBC and false otherwise
      */
-    bool usesPeriodicBoundaryConditions();
+    bool usesPeriodicBoundaryConditions() const;
 private:
     class ConstraintInfo;
     Vec3 periodicBoxVectors[3];

openmmapi/include/openmm/internal/OSRngSeed.h

-#ifndef OPENMM_OSRNGSEED_H_
+#ifndef OPENMM_OSRNGSEED_H_
 #define OPENMM_OSRNGSEED_H_