consolidating shooteru branches: shooteru-old -> shooteru branch: gingerbread