• Merge remote-tracking branch 'upstream/pr/74' into dev

    @kmcallister
    kmcallister committed Jan 31, 2015
    d53577f