UPDATED 12.5.2014 - 10:38AM 

Change-Id: I9b33701779443592d237636e86a4ed034c4a9631
Signed-off-by: Erik Hansen <mail.erik.hansen@gmail.com>