- removed deprecation warnings that remained from merge with branches/1.1
- removed deprecation warnings that remained from merge with branches/1.1
grendizerufo/libapril,grendizerufo/libapril,grendizerufo/libapril,grendizerufo/libapril,grendizerufo/libapril,grendizerufo/libapril