Merge branch 'master' into Dustin
Accessory delete action moved
Merge branch 'Dustin'
Merge branch 'marty'
Revert 5dde0a9..6e8b2d6

This rolls back to commit 5dde0a9c0cd0df4680e6ebd61a0086d8edbf83cf.
Merge branch 'marty'
Merge branch 'master' into marty