Merged icemobile changes into master.