V1.3

Merged username-removed-492539 requested to merge v1.3 into master