UPDATED: 12.6.2014

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