synchronization with C++ version
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta
Merge branch 'master' into ice-cream-sandwich
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics