Feb 1, 2013
Merge remote-tracking branch 'dtanabe/master'