Merge branch 'maverick' into develop

Compile under OSX

motor.c

@@ -1076,22 +1076,6 @@ int MotorCreate(SConnection * pCon, SicsInterp * pSics, void *pData,
       SCWrite(pCon, pBueffel, eLogError);
       return 0;
     }
-  } else if (strcmp(argv[2], "epics") == 0) {
-    if(argc > 3){
-      pDriver = epicsMakeMotorDriver(argv[3]);
-      if (!pDriver) {
-	return 0;
-      }
-      pNew = MotorInit("epics", argv[1], pDriver);
-      if (!pNew) {
-	snprintf(pBueffel,sizeof(pBueffel)-1, "Failure to create motor %s", argv[1]);
-	SCWrite(pCon, pBueffel, eLogError);
-	return 0;
-      }
-    } else {
-      SCWrite(pCon,"ERROR: missing basename argument to create EPICS motor",eError);
-      return 0;
-    }
   } else {
     site = getSite();
     if (site != NULL) {