Merge remote-tracking branch 'origin/master'

Conflicts:
	packages/Makefile

diff --cc packages/Makefile
index 508d64c1432210b6413dba92973baa2948515535,746d3138982913bc2930a06caac1e725c7411c20..dc60c476d1f7dea491c2c74a323c9a6c6b672f6b
--- 1/packages/Makefile
--- 2/packages/Makefile
+++ b/packages/Makefile
@@@ -46,7 -49,8 +49,9 @@@ FOOTPRINTS= 
        saw.fp \
        tfsoj-8.fp \
        bc4aa.fp \
 -      linear-s8.fp
+       cubesatshield.fp \
++      linear-s8.fp \
 +      PJ-037A.fp
  
  .5c.fp:
        nickle $*.5c > $@