20130307
Merge remote-tracking branch '1362674190swar/master'