sync with jay @ 20131024
Merge branch 'jay/20131024'