Merge remote-tracking branch 'upstream/devel' into devel

.meteor/packages

@@ -18,13 +18,13 @@ es5-shim
 aldeed:collection2
 cfs:gridfs
 cfs:standard-packages
+cottz:publish-relations
 dburles:collection-helpers
 idmontie:migrations
 matb33:collection-hooks
 matteodem:easy-search
 mongo
 mquandalle:collection-mutations
-reywood:publish-composite
 
 # Account system
 accounts-password

.meteor/versions

@@ -39,6 +39,7 @@ check@1.1.0
 chuangbo:cookie@1.1.0
 coffeescript@1.0.11
 cosmos:browserify@0.9.2
+cottz:publish-relations@2.0.0
 dburles:collection-helpers@1.0.4
 ddp@1.2.2
 ddp-client@1.2.1
@@ -120,7 +121,6 @@ reactive-dict@1.1.3
 reactive-var@1.0.6
 reload@1.1.4
 retry@1.0.4
-reywood:publish-composite@1.4.2
 routepolicy@1.0.6
 seriousm:emoji-continued@1.4.0
 service-configuration@1.0.5