minor performance changes
Version 1.12.0, Revision 2
Merge branch 'dev'