Integrate changes from upto f69d425cac

This commit is contained in:
James Gregory 2014-02-02 10:12:53 +11:00
commit e5f70b0317