updated flight to 7.x-2.x dev 9/19/14