Marjune 07-25-2014
Merge remote-tracking branch 'origin/master'