Merge Down from parent

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