SVN Sync 2014-11-28

Sync to dev SVN 2014-11-28