Merge latest 2013 11 15
Merge latest 2013 11 15 2