Merge remote-tracking branch 'origin/sqd' into sqd

# Conflicts:
#	src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml