24/10/13 3:15AM

changes of A1 are replaced in master
24/10/13 4:15AM

Merge master into A1