2012 -> 2013
Merge remote-tracking branch 'thiagofm/master'