Update 12-01-14

Change-Id: I04ebaaa5c6763cf7e43a5d14cbe37a2c80ae536a