Merged master changes into icemobile.