From 9a44fc4012f290922b481ed554db23bd828a62ef Mon Sep 17 00:00:00 2001
From: JacobBarthelmeh <jacob@wolfssl.com>
Date: Mon, 21 Jul 2014 11:35:36 -0600
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'upstream/master'