master
Merge commit '1531d6e5439daae01627b2645684876b75eaf5eb' as 'gitstatus'
Merge commit '39cf063480f6a378dadc802c174e96112c38c0c0'
Merge commit '22cb2f79ddb89a368dd823e815fa1b0587ff1b6a'
Merge commit '80ec734a953d930838ea6839923c97c3da880a0d'
Merge commit 'ba83466e1da75d9260ebbb145215d9c46d6eadf6'