Changes to Annos inventory to (supposedly) match what the doc wanted :V
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'