Merge 20141020 with stable px4 standard firmware