Changes for 2.029 -> 2.030

Rules.xml
 * Another large bundle of fixes