Hitcin 2014: ty PoC link
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Hitcin 2014: ty PoC link