Update 12-01-14

Change-Id: I8ca44af6dc1622446a56c163383d51c25f58431d