Merge apache/4.13

Forward merge: fixing command (#73)