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

Closed AliGH closed 12 years ago