sync to q-gears/master 11/23/14