master
Merge commit '1531d6e5439daae01627b2645684876b75eaf5eb' as 'gitstatus'
Merge commit '22cb2f79ddb89a368dd823e815fa1b0587ff1b6a'
Merge commit '140a6ade4e9d7431df697de4dfff04b353e219e2'
Squashed 'gitstatus/' changes from 44504a24..075baf6e
Merge commit 'd8041e4700ace779aaf42e19c3de2d25a14dbae8'
Merge commit 'bee6e09262a6145fc178ddc85c656da4bb83a9a9'
Merge commit 'c0a028351ff9a611c4061938ebd5ec4cafb900eb'
survive broken FPATH (#10