Merge remote-tracking branch 'fork/newmaster' into newmaster #52

Closed AliGH closed 11 years ago