Merging in Miguel's 0.7.9/background app fix