Merge @ 2014.9.28

Common Merge