New merge of upstream/master to develop branch.

The new stock reports work correctly in this merge.