Merge Down from parent

Taking required changes from ``crabcode/brackets-outline``