pulled changes from upstream
Merge branch '2.6.x' of github.com:dapage/Airtime into 2.6.x