Merge remote-tracking branch 'blasphemy/blasphemy-stable' into kitkat