Update from master 2013-11-14

04efc23d98994b82101d5560db96aecd681e78dd
Update from master 2013-11-22

c9696cb97f13d9cbacef01c0504822fdba7791e6
Update from master 2013-11-22

06e564b9f7c857bd9f896b6b0de7010bf021f3b5
Update from master 2013-11-24

4d31325859fa7e28f6396d69da921a4328d0dd81
Update from master 2013-11-24

5501c5cf6b09b9fcefa67b32e1a07f5e1431bafd
Update from master 2014-01-27

b3cb037f6e347d717383cbe7bef75d75771983fe
Update from master 2014-02-07

5501c5cf6b09b9fcefa67b32e1a07f5e1431bafd
Prevent linter error