jay/20131028
Merge branch 'jay/20131028'
jay 20131030
Merge branch 'jay/20131030'