Merge from original diydrones:master