am ab70a98b: (-s ours) am 612d570a: DO NOT MERGE Adjust amount pull effects...
am ab70a98b: (-s ours) am 612d570a: DO NOT MERGE Adjust amount pull effects the glow and edge decay.
Merge commit 'ab70a98b'
* commit 'ab70a98b':
DO NOT MERGE Adjust amount pull effects the glow and edge decay.