Bundle update 2013-12-28
Merge remote-tracking branch 'origin/master' into bundle/2013-12-28
Merge pull request #9 from sanemat/bundle/2013-12-28

Bundle update 2013-12-28