Move from script to bin
Merge branch 'script_to_bin' into 'master'

Move from script to bin

Reminder to merge when 7.0 gets released.
Update to 7.0
Merge branch 'update_7_0' into 'master'

Update to 7.0