Merge version 130523

Merge version 130523