Update to 12-07-2014

Change-Id: I702c6776c9c3ab67c87d0508c0bcb700fb77103f
Signed-off-by: Paul Beeler <pbeeler80@gmail.com>