Welcome 2014 (a **very** late welcome, that is)
Merge remote-tracking branch 'upstream/master'