synchronization with beta branch
Merge branch 'master' into ice-cream-sandwich
formatting
Merge branch 'master' into ice-cream-sandwich
XMLSerializer: exception management simplified
Merge branch 'master' into ice-cream-sandwich
members reordering
Merge branch 'master' into ice-cream-sandwich