Merge changes from 20131126 update.
Implement custom heavy rage meter.
Merge remote-tracking branch 'upstream/master'