Merge branch 'master' into gaedatastore, trying to get travis working