Merge branch 'rel-nano-15.05' into corvuscorax/fixedwingautotakeofftest