Merge remote-tracking branch 'upstream/pr/1040' into uorbtinymerge

Conflicts:
	mavlink/include/mavlink/v1.0
	src/modules/mc_att_control/mc_att_control_main.cpp

src/modules/uORB/Publication.cpp

@@ -53,10 +53,10 @@ namespace uORB {
 
 template<class T>
 Publication<T>::Publication(
-	List<PublicationBase *> * list,
-	const struct orb_metadata *meta) :
+	const struct orb_metadata *meta,
+	List<PublicationNode *> * list) :
 	T(), // initialize data structure to zero
-	PublicationBase(list, meta) {
+	PublicationNode(meta, list) {
 }
 
 template<class T>