merge 2.1 to master#24
Open
JeetKunDoug wants to merge 7 commits intomasterfrom
Open
Commits
Commits on May 22, 2015
- committed
Commits on Jun 15, 2015
- committed
Commits on Jul 27, 2015
- committed
Mark Allen - committed
Mark Allen
Commits on Oct 14, 2015
- committed
Brett Hazen - committed
Brett Hazen
Commits on Dec 22, 2015
- committed
Doug Rohrer