Squashed commit of the following:

commit 0105f3e03aa0bc086d114f20ab411260c821095f
Author: Matt Dwen <matt@group6.co.nz>
Date:   Mon Aug 12 16:56:44 2013 +1200

    Feature 1.