mapfishapp - fixed regression introduced by 5c1058
merge 13.06 into 13.09
Merge branch '13.09'